*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b135c84b2cf1882614c1673b84333d3cd426fd8a..086da569412861dbbbc04391dfe3268cfcf15bcd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-12  Juanma Barranquero  <lekktu@gmail.com>
+
+       * desktop.el (desktop-load-locked-desktop): New option.
+       (desktop-read): Use it.
+       (desktop-truncate, desktop-outvar, desktop-restore-file-buffer):
+       Use `when'.
+
 2007-06-12  Davis Herring  <herring@lanl.gov>
 
        * desktop.el (desktop-save-mode-off): New function.